[WIP] Remote changes order - #1573
Open
taratatach wants to merge 5 commits into
Open
Conversation
Testing that the following assumptions are not all verified in the
resulting order from the remote change sorter:
- alphabetical order
- conflicts before anything else on same id
- deletion before addition on same id
To simulate the directory move from `src/dir` to `dst/dir` on a remote client, we were creating the destination folders and files and remove the sources instead of applying a folder move as the actual implementation does.
taratatach
force-pushed
the
remote-changes-order
branch
from
May 13, 2019 14:02
64056f9 to
758c4fb
Compare
taratatach
force-pushed
the
master
branch
2 times, most recently
from
April 10, 2021 09:52
8a36ecb to
a9a996e
Compare
taratatach
force-pushed
the
master
branch
2 times, most recently
from
January 18, 2022 15:35
8d7d624 to
18fc74a
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Please make sure the following boxes are checked: